From 4f58d23eb17e2a5b3e1f4a742c9c80fa8a1dce5f Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Fri, 7 Mar 2008 13:09:47 -0700 Subject: [PATCH] [IA64] Remove GPFN_INV_MASK This slightly simplify code and frees a pte bit. Signed-off-by: Tristan Gingold --- xen/arch/ia64/vmx/sioemu.c | 3 +-- xen/arch/ia64/xen/mm.c | 8 +++----- xen/include/asm-ia64/linux-xen/asm/pgtable.h | 4 +--- xen/include/asm-ia64/mm.h | 8 +++----- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/xen/arch/ia64/vmx/sioemu.c b/xen/arch/ia64/vmx/sioemu.c index 637599d562..7a533138af 100644 --- a/xen/arch/ia64/vmx/sioemu.c +++ b/xen/arch/ia64/vmx/sioemu.c @@ -166,8 +166,7 @@ sioemu_add_io_physmap (struct domain *d, unsigned long start, /* Check area is currently unassigned. */ for (i = start; i < start + size; i += PAGE_SIZE) { - unsigned long mpa = ____lookup_domain_mpa(d, i); - if (mpa != GPFN_INV_MASK && mpa != INVALID_MFN) + if (____lookup_domain_mpa(d, i) != INVALID_MFN) return -EBUSY; } diff --git a/xen/arch/ia64/xen/mm.c b/xen/arch/ia64/xen/mm.c index b984ad44c7..4f880a7ca1 100644 --- a/xen/arch/ia64/xen/mm.c +++ b/xen/arch/ia64/xen/mm.c @@ -726,8 +726,6 @@ ____lookup_domain_mpa(struct domain *d, unsigned long mpaddr) if (pte_present(*pte)) return (pte->pte & _PFN_MASK); - else if (VMX_DOMAIN(d->vcpu[0])) - return GPFN_INV_MASK; return INVALID_MFN; } @@ -742,8 +740,8 @@ unsigned long lookup_domain_mpa(struct domain *d, unsigned long mpaddr, if (entry != NULL) p2m_entry_set(entry, pte, tmp_pte); return pte_val(tmp_pte); - } else if (VMX_DOMAIN(d->vcpu[0])) - return GPFN_INV_MASK; + } else if (is_hvm_domain(d)) + return INVALID_MFN; } if (mpaddr < d->arch.convmem_end && !d->is_dying) { @@ -2797,7 +2795,7 @@ arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) } /* This hypercall is used for VT-i domain only */ - if (!VMX_DOMAIN(d->vcpu[0])) { + if (!is_hvm_domain(d)) { rcu_unlock_domain(d); return -ENOSYS; } diff --git a/xen/include/asm-ia64/linux-xen/asm/pgtable.h b/xen/include/asm-ia64/linux-xen/asm/pgtable.h index 70ac05f5c8..c8f2dbebf9 100644 --- a/xen/include/asm-ia64/linux-xen/asm/pgtable.h +++ b/xen/include/asm-ia64/linux-xen/asm/pgtable.h @@ -108,7 +108,6 @@ #define GPFN_HIGH_MMIO (7UL << 60) /* High MMIO range */ #define GPFN_IO_MASK (7UL << 60) /* Guest pfn is I/O type */ -#define GPFN_INV_MASK (1UL << 63) /* Guest pfn is invalid */ #else #define _PAGE_PROTNONE (__IA64_UL(1) << 63) @@ -342,8 +341,7 @@ set_pte_rel(volatile pte_t* ptep, pte_t pteval) #define pte_file(pte) ((pte_val(pte) & _PAGE_FILE) != 0) #ifdef XEN #define pte_pgc_allocated(pte) ((pte_val(pte) & _PAGE_PGC_ALLOCATED) != 0) -#define pte_mem(pte) \ - (!(pte_val(pte) & (GPFN_IO_MASK | GPFN_INV_MASK)) && !pte_none(pte)) +#define pte_mem(pte) (!(pte_val(pte) & GPFN_IO_MASK) && !pte_none(pte)) #endif /* * Note: we convert AR_RWX to AR_RX and AR_RW to AR_R by clearing the 2nd bit in the diff --git a/xen/include/asm-ia64/mm.h b/xen/include/asm-ia64/mm.h index 88934878db..7bf01f17b9 100644 --- a/xen/include/asm-ia64/mm.h +++ b/xen/include/asm-ia64/mm.h @@ -479,7 +479,7 @@ extern u64 translate_domain_pte(u64 pteval, u64 address, u64 itir__, gmfn_to_mfn_foreign((_d), (gpfn)) #define __gpfn_invalid(_d, gpfn) \ - (lookup_domain_mpa((_d), ((gpfn)<